diff --git a/demos/session/src/main/java/androidx/media3/demo/session/PlayerActivity.kt b/demos/session/src/main/java/androidx/media3/demo/session/PlayerActivity.kt
index 134405ed9b..a805ab9533 100644
--- a/demos/session/src/main/java/androidx/media3/demo/session/PlayerActivity.kt
+++ b/demos/session/src/main/java/androidx/media3/demo/session/PlayerActivity.kt
@@ -203,7 +203,8 @@ class PlayerActivity : AppCompatActivity() {
           .setTextColor(ContextCompat.getColor(context, R.color.white))
         deleteButton.visibility = View.VISIBLE
         deleteButton.setOnClickListener {
-          controller.removeMediaItem(position)
+          //controller.removeMediaItem(position)
+          controller.setMediaItems(mutableListOf())
           updateCurrentPlaylistUI()
         }
       }
diff --git a/demos/session_service/src/main/java/androidx/media3/demo/session/DemoPlaybackService.kt b/demos/session_service/src/main/java/androidx/media3/demo/session/DemoPlaybackService.kt
index 66d68fd647..a69b524c0d 100644
--- a/demos/session_service/src/main/java/androidx/media3/demo/session/DemoPlaybackService.kt
+++ b/demos/session_service/src/main/java/androidx/media3/demo/session/DemoPlaybackService.kt
@@ -30,6 +30,7 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.core.Serializer
 import androidx.datastore.dataStore
 import androidx.media3.common.AudioAttributes
+import androidx.media3.common.ForwardingSimpleBasePlayer
 import androidx.media3.common.Player
 import androidx.media3.common.listen
 import androidx.media3.common.util.UnstableApi
@@ -137,10 +138,10 @@ open class DemoPlaybackService : MediaLibraryService() {
   @OptIn(UnstableApi::class) // Player.listen
   private fun initializeSessionAndPlayer() {
     val player =
-      ExoPlayer.Builder(this)
+      ForwardingSimpleBasePlayer(ExoPlayer.Builder(this)
         .setAudioAttributes(AudioAttributes.DEFAULT, /* handleAudioFocus= */ true)
-        .build()
-    player.addAnalyticsListener(EventLogger())
+        .build())
+    //player.addAnalyticsListener(EventLogger())
     CoroutineScope(Dispatchers.Unconfined).launch {
       player.listen { events ->
         if (